Implement domain removal in mod_roster #3291

Premwoik · 2021-09-22T12:53:57Z

This PR implements domain removal in mod_roster (only rdbms).

Proposed changes include:

extracting some functions to allow reuse,
handling domain removal in mod_roster_rdbms,
implementation of domain_removal hook in the mod_roster,
adding a test case to the domain_removal_SUITE.

codecov · 2021-09-22T13:04:55Z

Codecov Report

Merging #3291 (379b5f9) into master (081de08) will decrease coverage by 0.00%.
The diff coverage is 82.35%.

@@            Coverage Diff             @@
##           master    #3291      +/-   ##
==========================================
- Coverage   80.25%   80.24%   -0.01%     
==========================================
  Files         398      398              
  Lines       32559    32574      +15     
==========================================
+ Hits        26129    26139      +10     
- Misses       6430     6435       +5

Impacted Files	Coverage Δ
src/auth/mongoose_gen_auth.erl	`81.57% <ø> (-0.93%)`	⬇️
src/mod_roster.erl	`79.09% <62.50%> (-0.33%)`	⬇️
src/backend_module.erl	`97.43% <100.00%> (+0.13%)`	⬆️
src/mod_roster_rdbms.erl	`96.15% <100.00%> (+0.21%)`	⬆️
src/mam/mod_mam_rdbms_async_pool_writer.erl	`66.66% <0.00%> (-3.93%)`	⬇️
...bal_distrib/mod_global_distrib_hosts_refresher.erl	`71.69% <0.00%> (-1.89%)`	⬇️
src/global_distrib/mod_global_distrib_receiver.erl	`78.88% <0.00%> (-1.12%)`	⬇️
src/mod_muc_room.erl	`77.12% <0.00%> (-0.06%)`	⬇️
src/mod_muc_log.erl	`77.88% <0.00%> (ø)`
src/ejabberd_c2s.erl	`89.22% <0.00%> (ø)`
... and 2 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 081de08...379b5f9. Read the comment docs.

mongoose-im · 2021-09-22T13:05:01Z

small_tests_24 / small_tests / 210cda0
Reports root / small

internal_mnesia_24 / internal_mnesia / 210cda0
Reports root/ big
OK: 1588 / Failed: 1 / User-skipped: 291 / Auto-skipped: 0

amp_big_SUITE:offline:offline_success:notify_deliver_to_offline_user_recipient_privacy_test

{error,
  {test_case_failed,
    {has_stanzas_but_shouldnt,
      {client,
        <<"alicE_notify_deliver_to_offline_user_recipient_privacy_test_23.63881@localhost/res1">>,
        escalus_tcp,<0.4120.0>,
        [{event_manager,<0.3811.0>},
         {server,<<"localhost">>},
         {username,
           <<"alicE_notify_deliver_to_offline_user_recipient_privacy_test_23.63881">>},
         {resource,<<"res1">>}],
        [{event_client,
           [{event_manager,<0.3811.0>},
            {server,<<"localhost">>},
            {username,
              <<"alicE_notify_deliver_to_offline_user_recipient_privacy_test_23.63881">>},
            {resource,<<"res1">>}]},
         {resource,<<"res1">>},
         {username,
           <<"alicE_notify_deliver_to_offline_user_recipient_privacy_test_23.63881">>},
         {server,<<"localhost">>},
         {host,<<"localhost">>},
         {port,5222},
         {auth,{escalus_auth,auth_plain}},
         {wspath,undefined},
         {username,
           <<"alicE_notify_deliver_to_offline_user_recipient_privacy_test_23.63881">>},
         {server,<<"localhost">>},
         {password,<<"matygrysa">>},
         {stream_id,<<"6b3aed7cb93a59a6">>}]},
      [{xmlel,<<"stream:error">>,[],
         [{xmlel,<<"conflict">>,
            [{<<"xmlns">>,
            <<"urn:ietf:params:xml:ns:xmpp-streams">>}],
            []},
          {xmlel,<<"text">>,
            [{<<"xml:lang">>,<<"en">>},
             {<<"xmlns">>,
            <<"urn:ietf:params:x...

Report log

small_tests_22 / small_tests / 210cda0
Reports root / small

small_tests_23 / small_tests / 210cda0
Reports root / small

ldap_mnesia_24 / ldap_mnesia / 210cda0
Reports root/ big
OK: 1486 / Failed: 0 / User-skipped: 394 / Auto-skipped: 0

dynamic_domains_24 / pgsql_mnesia / 210cda0
Reports root/ big
OK: 2676 / Failed: 0 / User-skipped: 183 / Auto-skipped: 0

ldap_mnesia_22 / ldap_mnesia / 210cda0
Reports root/ big
OK: 1486 / Failed: 0 / User-skipped: 394 / Auto-skipped: 0

dynamic_domains_23 / pgsql_mnesia / 210cda0
Reports root/ big
OK: 2676 / Failed: 0 / User-skipped: 183 / Auto-skipped: 0

pgsql_mnesia_22 / pgsql_mnesia / 210cda0
Reports root/ big
OK: 3065 / Failed: 0 / User-skipped: 211 / Auto-skipped: 0

ldap_mnesia_23 / ldap_mnesia / 210cda0
Reports root/ big
OK: 1486 / Failed: 0 / User-skipped: 394 / Auto-skipped: 0

pgsql_mnesia_24 / pgsql_mnesia / 210cda0
Reports root/ big
OK: 3065 / Failed: 0 / User-skipped: 211 / Auto-skipped: 0

elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / 210cda0
Reports root/ big
OK: 1862 / Failed: 0 / User-skipped: 317 / Auto-skipped: 0

mssql_mnesia_24 / odbc_mssql_mnesia / 210cda0
Reports root/ big
OK: 3071 / Failed: 1 / User-skipped: 211 / Auto-skipped: 0

mod_ping_SUITE:server_ping_kill:server_ping_pong

{error,{{badmatch,[{[<<"localhost">>,mod_ping,ping_response],
          {expected_diff,5},
          {before_story,5},
          {after_story,9}}]},
    [{escalus_mongooseim,post_story_check_metrics,1,
               [{file,"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_mongooseim.erl"},
                {line,74}]},
     {escalus_mongooseim,maybe_check_metrics_post_story,1,
               [{file,"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_mongooseim.erl"},
                {line,51}]},
     {escalus_story,story,4,
            [{file,"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
             {line,75}]},
     {test_server,ts_tc,3,[{file,"test_server.erl"},{line,1783}]},
     {test_server,run_test_case_eval1,6,
            [{file,"test_server.erl"},{line,1292}]},
     {test_server,run_test_case_eval,9,
            [{file,"test_server.erl"},{line,1224}]}]}}

Report log

pgsql_mnesia_23 / pgsql_mnesia / 210cda0
Reports root/ big
OK: 3101 / Failed: 2 / User-skipped: 211 / Auto-skipped: 0

jingle_SUITE:all:resp_4xx_from_sip_proxy_results_in_session_terminate

{error,
  {{assertion_failed,assert,is_iq_result,
     {xmlel,<<"iq">>,
       [{<<"from">>,<<"error.480@localhost">>},
        {<<"to">>,
         <<"alice_resp_4xx_from_sip_proxy_results_in_session_terminate_5.749599@localhost/res1">>},
        {<<"id">>,<<"44e99ada-6b02-4a14-80e7-507422c51bd5">>},
        {<<"type">>,<<"set">>}],
       [{xmlel,<<"jingle">>,
          [{<<"xmlns">>,<<"urn:xmpp:jingle:1">>},
           {<<"action">>,<<"session-terminate">>},
           {<<"sid">>,<<"3b7395f9-cc3f-4ce4-b1a4-af4fc8a1cb9a">>}],
          [{xmlel,<<"reason">>,[],
             [{xmlel,<<"general-error">>,[],[]},
            {xmlel,<<"sip-error">>,
              [{<<"code">>,<<"480">>}],
              [{xmlcdata,<<"Temporarily Unavailable">>}]}]}]}]},
     "<iq from='error.480@localhost' to='alice_resp_4xx_from_sip_proxy_results_in_session_terminate_5.749599@localhost/res1' id='44e99ada-6b02-4a14-80e7-507422c51bd5' type='set'><jingle xmlns='urn:xmpp:jingle:1' action='session-terminate' sid='3b7395f9-cc3f-4ce4-b1a4-af4fc8a1cb9a'><reason><general-error/><sip-error code='480'>Temporarily Unavailable</sip-error></reason></jingle></iq>"},
   [{escalus_new_assert,assert_true,2,
      [{file,
         "/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_new_assert.erl"},
       {line,84}]},
    {jingle_SUITE,send_initiate_and_wait_for_first_iq_set,2,
      [{file,"/home/circleci/app/big_tests/tests/jingle_SUITE.erl"},
       {line,395}]},
    {jingle_SUITE,
      '-resp_...

Report log

jingle_SUITE:all:resp_4xx_from_sip_proxy_results_in_session_terminate

{error,
  {{assertion_failed,assert,is_iq_result,
     {xmlel,<<"iq">>,
       [{<<"from">>,<<"error.480@localhost">>},
        {<<"to">>,
         <<"alice_resp_4xx_from_sip_proxy_results_in_session_terminate_15.720990@localhost/res1">>},
        {<<"id">>,<<"0c9984da-859a-41e9-91d9-539f8846d256">>},
        {<<"type">>,<<"set">>}],
       [{xmlel,<<"jingle">>,
          [{<<"xmlns">>,<<"urn:xmpp:jingle:1">>},
           {<<"action">>,<<"session-terminate">>},
           {<<"sid">>,<<"c4e6d9a0-0942-41ce-a59e-8e3877df8408">>}],
          [{xmlel,<<"reason">>,[],
             [{xmlel,<<"general-error">>,[],[]},
            {xmlel,<<"sip-error">>,
              [{<<"code">>,<<"480">>}],
              [{xmlcdata,<<"Temporarily Unavailable">>}]}]}]}]},
     "<iq from='error.480@localhost' to='alice_resp_4xx_from_sip_proxy_results_in_session_terminate_15.720990@localhost/res1' id='0c9984da-859a-41e9-91d9-539f8846d256' type='set'><jingle xmlns='urn:xmpp:jingle:1' action='session-terminate' sid='c4e6d9a0-0942-41ce-a59e-8e3877df8408'><reason><general-error/><sip-error code='480'>Temporarily Unavailable</sip-error></reason></jingle></iq>"},
   [{escalus_new_assert,assert_true,2,
      [{file,
         "/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_new_assert.erl"},
       {line,84}]},
    {jingle_SUITE,send_initiate_and_wait_for_first_iq_set,2,
      [{file,"/home/circleci/app/big_tests/tests/jingle_SUITE.erl"},
       {line,395}]},
    {jingle_SUITE,
      '-res...

Report log

mysql_redis_24 / mysql_redis / 210cda0
Reports root/ big
OK: 3048 / Failed: 0 / User-skipped: 228 / Auto-skipped: 0

riak_mnesia_24 / riak_mnesia / 210cda0
Reports root/ big
OK: 1727 / Failed: 1 / User-skipped: 320 / Auto-skipped: 0

jingle_SUITE:all:jingle_session_is_established_when_calling_a_number

{error,
  {{assertion_failed,assert,is_iq_result,
     {xmlel,<<"iq">>,
       [{<<"from">>,<<"[email protected]">>},
        {<<"to">>,
         <<"alice_jingle_session_is_established_when_calling_a_number_44.20067@localhost/res1">>},
        {<<"id">>,<<"8a305c1e-a3d0-4198-99e0-19a2ec622cdd">>},
        {<<"type">>,<<"set">>}],
       [{xmlel,<<"jingle">>,
          [{<<"xmlns">>,<<"urn:xmpp:jingle:1">>},
           {<<"action">>,<<"session-info">>},
           {<<"sid">>,<<"3d08a806-e9c3-4f33-b9c0-37b7f8934d16">>}],
          [{xmlel,<<"ringing">>,
             [{<<"xmlns">>,<<"urn:xmpp:jingle:apps:rtp:info:1">>}],
             []}]}]},
     "<iq from='[email protected]' to='alice_jingle_session_is_established_when_calling_a_number_44.20067@localhost/res1' id='8a305c1e-a3d0-4198-99e0-19a2ec622cdd' type='set'><jingle xmlns='urn:xmpp:jingle:1' action='session-info' sid='3d08a806-e9c3-4f33-b9c0-37b7f8934d16'><ringing xmlns='urn:xmpp:jingle:apps:rtp:info:1'/></jingle></iq>"},
   [{escalus_new_assert,assert_true,2,
      [{file,
         "/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_new_assert.erl"},
       {line,84}]},
    {jingle_SUITE,send_initiate_and_wait_for_first_iq_set,2,
      [{file,"/home/circleci/app/big_tests/tests/jingle_SUITE.erl"},
       {line,395}]},
    {jingle_SUITE,
      '-jingle_session_is_established_when_calling_a_number/1-fun-0-',1,
      [{file,"/home/circleci/app/big_tests/tests/jingle_SUITE.erl"},
       {line,...

Report log

mongoose-im · 2021-09-22T13:35:26Z

small_tests_24 / small_tests / dae20e0
Reports root / small

internal_mnesia_24 / internal_mnesia / dae20e0
Reports root/ big
OK: 1589 / Failed: 0 / User-skipped: 291 / Auto-skipped: 0

mongoose-im · 2021-09-22T13:36:55Z

small_tests_24 / small_tests / b9df246
Reports root / small

internal_mnesia_24 / internal_mnesia / b9df246
Reports root/ big
OK: 1588 / Failed: 1 / User-skipped: 291 / Auto-skipped: 0

amp_big_SUITE:offline:offline_failure:error_deliver_to_offline_user_test

{error,
  {{assertion_failed,assert,is_presence,
     {xmlel,<<"stream:error">>,[],
       [{xmlel,<<"conflict">>,
          [{<<"xmlns">>,<<"urn:ietf:params:xml:ns:xmpp-streams">>}],
          []},
        {xmlel,<<"text">>,
          [{<<"xml:lang">>,<<"en">>},
           {<<"xmlns">>,<<"urn:ietf:params:xml:ns:xmpp-streams">>}],
          [{xmlcdata,<<"Replaced by new connection">>}]}]},
     "<stream:error><conflict xmlns='urn:ietf:params:xml:ns:xmpp-streams'/><text xml:lang='en' xmlns='urn:ietf:params:xml:ns:xmpp-streams'>Replaced by new connection</text></stream:error>"},
   [{escalus_new_assert,assert_true,2,
      [{file,
         "/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_new_assert.erl"},
       {line,84}]},
    {escalus_story,'-drop_presences/2-lc$^0/1-0-',1,
      [{file,
         "/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
       {line,190}]},
    {escalus_story,drop_presences,2,
      [{file,
         "/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
       {line,190}]},
    {escalus_story,'-start_ready_clients/2-fun-0-',3,
      [{file,
         "/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
       {line,135}]},
    {lists,foldl,3,[{file,"lists.erl"},{line,1267}]},
    {escalus_story,start_ready_clients,2,
      [{file,
         "/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
       {line,128}]},
   ...

Report log

small_tests_22 / small_tests / b9df246
Reports root / small

small_tests_23 / small_tests / b9df246
Reports root / small

dynamic_domains_24 / pgsql_mnesia / b9df246
Reports root/ big
OK: 2676 / Failed: 0 / User-skipped: 183 / Auto-skipped: 0

ldap_mnesia_24 / ldap_mnesia / b9df246
Reports root/ big
OK: 1486 / Failed: 0 / User-skipped: 394 / Auto-skipped: 0

dynamic_domains_23 / pgsql_mnesia / b9df246
Reports root/ big
OK: 2676 / Failed: 0 / User-skipped: 183 / Auto-skipped: 0

ldap_mnesia_22 / ldap_mnesia / b9df246
Reports root/ big
OK: 1486 / Failed: 0 / User-skipped: 394 / Auto-skipped: 0

pgsql_mnesia_24 / pgsql_mnesia / b9df246
Reports root/ big
OK: 3065 / Failed: 0 / User-skipped: 211 / Auto-skipped: 0

ldap_mnesia_23 / ldap_mnesia / b9df246
Reports root/ big
OK: 1486 / Failed: 0 / User-skipped: 394 / Auto-skipped: 0

elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / b9df246
Reports root/ big
OK: 1862 / Failed: 0 / User-skipped: 317 / Auto-skipped: 0

mysql_redis_24 / mysql_redis / b9df246
Reports root/ big
OK: 3054 / Failed: 1 / User-skipped: 228 / Auto-skipped: 0

mam_SUITE:rdbms_async_cache_prefs_cases:messages_filtered_when_prefs_default_policy_is_never

{error,{test_case_failed,"ASSERT EQUAL\n\tExpected []\n\tValue [ok]\n"}}

Report log

pgsql_mnesia_22 / pgsql_mnesia / b9df246
Reports root/ big
OK: 3065 / Failed: 0 / User-skipped: 211 / Auto-skipped: 0

pgsql_mnesia_23 / pgsql_mnesia / b9df246
Reports root/ big
OK: 3063 / Failed: 1 / User-skipped: 211 / Auto-skipped: 1

mongooseimctl_SUITE:stats:stats_global

{error,{{badmatch,{"5\n",0}},
    [{mongooseimctl_SUITE,'-stats_global/1-fun-0-',3,
                [{file,"/home/circleci/app/big_tests/tests/mongooseimctl_SUITE.erl"},
                 {line,1056}]},
     {escalus_story,story,4,
            [{file,"/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
             {line,72}]},
     {test_server,ts_tc,3,[{file,"test_server.erl"},{line,1784}]},
     {test_server,run_test_case_eval1,6,
            [{file,"test_server.erl"},{line,1293}]},
     {test_server,run_test_case_eval,9,
            [{file,"test_server.erl"},{line,1225}]}]}}

Report log

mssql_mnesia_24 / odbc_mssql_mnesia / b9df246
Reports root/ big
OK: 3065 / Failed: 0 / User-skipped: 211 / Auto-skipped: 0

riak_mnesia_24 / riak_mnesia / b9df246
Reports root/ big
OK: 1709 / Failed: 0 / User-skipped: 320 / Auto-skipped: 0

internal_mnesia_24 / internal_mnesia / b9df246
Reports root/ big
OK: 1589 / Failed: 0 / User-skipped: 291 / Auto-skipped: 0

pgsql_mnesia_23 / pgsql_mnesia / b9df246
Reports root/ big
OK: 3065 / Failed: 0 / User-skipped: 211 / Auto-skipped: 0

big_tests/tests/domain_removal_SUITE.erl

src/mod_roster_mnesia.erl

src/mod_roster_rdbms.erl

src/mod_roster_riak.erl

big_tests/tests/domain_removal_SUITE.erl

chrzaszcz

Code looks good to me. I don't have any extra comments, I responded to the existing ones.

src/mod_roster_mnesia.erl

big_tests/tests/domain_removal_SUITE.erl

mongoose-im · 2021-09-23T12:28:15Z

small_tests_24 / small_tests / 379b5f9
Reports root / small

internal_mnesia_24 / internal_mnesia / 379b5f9
Reports root/ big
OK: 1589 / Failed: 0 / User-skipped: 291 / Auto-skipped: 0

small_tests_22 / small_tests / 379b5f9
Reports root / small

small_tests_23 / small_tests / 379b5f9
Reports root / small

dynamic_domains_24 / pgsql_mnesia / 379b5f9
Reports root/ big
OK: 2676 / Failed: 0 / User-skipped: 183 / Auto-skipped: 0

ldap_mnesia_22 / ldap_mnesia / 379b5f9
Reports root/ big
OK: 1486 / Failed: 0 / User-skipped: 394 / Auto-skipped: 0

ldap_mnesia_24 / ldap_mnesia / 379b5f9
Reports root/ big
OK: 1486 / Failed: 0 / User-skipped: 394 / Auto-skipped: 0

elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / 379b5f9
Reports root/ big
OK: 1862 / Failed: 0 / User-skipped: 317 / Auto-skipped: 0

dynamic_domains_23 / pgsql_mnesia / 379b5f9
Reports root/ big
OK: 2676 / Failed: 0 / User-skipped: 183 / Auto-skipped: 0

pgsql_mnesia_22 / pgsql_mnesia / 379b5f9
Reports root/ big
OK: 3065 / Failed: 0 / User-skipped: 211 / Auto-skipped: 0

ldap_mnesia_23 / ldap_mnesia / 379b5f9
Reports root/ big
OK: 1486 / Failed: 0 / User-skipped: 394 / Auto-skipped: 0

mysql_redis_24 / mysql_redis / 379b5f9
Reports root/ big
OK: 3054 / Failed: 1 / User-skipped: 228 / Auto-skipped: 0

mam_SUITE:rdbms_prefs_cases:prefs_set_cdata_request

{error,{test_case_failed,"ASSERT EQUAL\n\tExpected {prefs_result_iq,<<\"roster\">>,\n                  [<<\"[email protected]\">>,\n                   <<\"[email protected]\">>],\n                  []}\n\tValue {prefs_result_iq,<<\"always\">>,\n                 [<<\"[email protected]\">>,\n                <<\"[email protected]\">>],\n                 []}\n"}}

Report log

mssql_mnesia_24 / odbc_mssql_mnesia / 379b5f9
Reports root/ big
OK: 3065 / Failed: 0 / User-skipped: 211 / Auto-skipped: 0

pgsql_mnesia_23 / pgsql_mnesia / 379b5f9
Reports root/ big
OK: 3065 / Failed: 0 / User-skipped: 211 / Auto-skipped: 0

riak_mnesia_24 / riak_mnesia / 379b5f9
Reports root/ big
OK: 1731 / Failed: 2 / User-skipped: 320 / Auto-skipped: 0

jingle_SUITE:all:resp_4xx_from_sip_proxy_results_in_session_terminate

{error,
  {{assertion_failed,assert,is_iq_result,
     {xmlel,<<"iq">>,
       [{<<"from">>,<<"error.480@localhost">>},
        {<<"to">>,
         <<"alice_resp_4xx_from_sip_proxy_results_in_session_terminate_94.777812@localhost/res1">>},
        {<<"id">>,<<"194c1450-08a0-499f-ba2e-ceca4e95d3ec">>},
        {<<"type">>,<<"set">>}],
       [{xmlel,<<"jingle">>,
          [{<<"xmlns">>,<<"urn:xmpp:jingle:1">>},
           {<<"action">>,<<"session-terminate">>},
           {<<"sid">>,<<"06dcb2c5-b3b4-44f1-8909-9d9472af0975">>}],
          [{xmlel,<<"reason">>,[],
             [{xmlel,<<"general-error">>,[],[]},
            {xmlel,<<"sip-error">>,
              [{<<"code">>,<<"480">>}],
              [{xmlcdata,<<"Temporarily Unavailable">>}]}]}]}]},
     "<iq from='error.480@localhost' to='alice_resp_4xx_from_sip_proxy_results_in_session_terminate_94.777812@localhost/res1' id='194c1450-08a0-499f-ba2e-ceca4e95d3ec' type='set'><jingle xmlns='urn:xmpp:jingle:1' action='session-terminate' sid='06dcb2c5-b3b4-44f1-8909-9d9472af0975'><reason><general-error/><sip-error code='480'>Temporarily Unavailable</sip-error></reason></jingle></iq>"},
   [{escalus_new_assert,assert_true,2,
      [{file,
         "/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_new_assert.erl"},
       {line,84}]},
    {jingle_SUITE,send_initiate_and_wait_for_first_iq_set,2,
      [{file,"/home/circleci/app/big_tests/tests/jingle_SUITE.erl"},
       {line,395}]},
    {jingle_SUITE,
      '-res...

Report log

s2s_SUITE:node1_tls_optional_node2_tls_required_trusted_with_cachain:simple_message

{error,
  {timeout_when_waiting_for_stanza,
    [{escalus_client,wait_for_stanza,
       [{client,<<"alice_simple_message_69.199480@fed1/res1">>,
          escalus_tcp,<0.12778.1>,
          [{event_manager,<0.12774.1>},
           {server,<<"fed1">>},
           {username,<<"alice_simple_message_69.199480">>},
           {resource,<<"res1">>}],
          [{event_client,
             [{event_manager,<0.12774.1>},
            {server,<<"fed1">>},
            {username,<<"alice_simple_message_69.199480">>},
            {resource,<<"res1">>}]},
           {resource,<<"res1">>},
           {username,<<"alice_simple_message_69.199480">>},
           {server,<<"fed1">>},
           {host,<<"localhost">>},
           {port,5242},
           {auth,{escalus_auth,auth_plain}},
           {wspath,undefined},
           {username,<<"alice_simple_message_69.199480">>},
           {server,<<"fed1">>},
           {host,<<"localhost">>},
           {port,5242},
           {password,<<"makota2">>},
           {stream_id,<<"44bbd3e6359dce24">>}]},
        10000],
       [{file,
          "/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_client.erl"},
        {line,136}]},
     {s2s_SUITE,'-simple_message/1-fun-0-',2,
       [{file,"/home/circleci/app/big_tests/tests/s2s_SUITE.erl"},
        {line,124}]},
     {escalus_story,story,4,
       [{file,
          "/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
        {line,72}]},
     {test_serve...

Report log

small_tests_23 / small_tests / 379b5f9
Reports root / small

pgsql_mnesia_24 / pgsql_mnesia / 379b5f9
Reports root/ big
OK: 3065 / Failed: 0 / User-skipped: 211 / Auto-skipped: 0

vkatsuba · 2021-09-23T15:16:09Z

big_tests/tests/domain_removal_SUITE.erl

+        {selected, []} = select_roster_version(host_type(), domain())
+        end).
+
+select_rosterusers(HostType, Domain) ->


I suppose this function can be simplified like(name can be used other):

select_from_roster(Table) -> Query = "SELECT * FROM " ++ Table ++ " WHERE server='" ++ binary_to_list(domain()) ++ "'", {selected, Res} = rpc(mim(), mongoose_rdbms, sql_query, [host_type(), Query]), Res.

using:

[] = select_from_roster("rosterusers") [_] = select_from_roster("rostergroups") [] = select_from_roster("roster_version")

vkatsuba

LGTM. Posted small comment, but since comment is related to tests, this can be done in any time.

Premwoik force-pushed the domain-removal-mod-roster branch 2 times, most recently from dae20e0 to b9df246 Compare September 22, 2021 13:25

Premwoik marked this pull request as ready for review September 22, 2021 14:39

vkatsuba reviewed Sep 22, 2021

View reviewed changes

chrzaszcz reviewed Sep 23, 2021

View reviewed changes

src/mod_roster_mnesia.erl Outdated Show resolved Hide resolved

big_tests/tests/domain_removal_SUITE.erl Show resolved Hide resolved

Premwoik added 7 commits September 23, 2021 14:10

Extract is_exported function to backend_module

4cd6ef6

Add remove domain to mod_roster

016471a

Handle domain removal in mod_roster_rdbms backend

624a230

Add test case for roster domain removal in domain_removal_SUITE

e453448

Extract set/restore versioning functions to roster_helper module

1de9089

Enable versioning in roster domain removal test case

1727d1c

Add DB tables checks before and after domain removal

379b5f9

Premwoik force-pushed the domain-removal-mod-roster branch from b9df246 to 379b5f9 Compare September 23, 2021 12:16

Premwoik requested review from chrzaszcz and vkatsuba September 23, 2021 13:56

vkatsuba reviewed Sep 23, 2021

View reviewed changes

vkatsuba approved these changes Sep 23, 2021

View reviewed changes

vkatsuba merged commit a75e7d5 into master Sep 23, 2021

vkatsuba deleted the domain-removal-mod-roster branch September 23, 2021 17:21

Premwoik added this to the 5.0.0 milestone Oct 5, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implement domain removal in mod_roster #3291

Implement domain removal in mod_roster #3291

Premwoik commented Sep 22, 2021 •

edited

Loading

codecov bot commented Sep 22, 2021 •

edited

Loading

mongoose-im commented Sep 22, 2021 •

edited

Loading

mongoose-im commented Sep 22, 2021 •

edited

Loading

mongoose-im commented Sep 22, 2021 •

edited

Loading

chrzaszcz left a comment

mongoose-im commented Sep 23, 2021 •

edited

Loading

vkatsuba Sep 23, 2021

vkatsuba left a comment

Implement domain removal in mod_roster #3291

Implement domain removal in mod_roster #3291

Conversation

Premwoik commented Sep 22, 2021 • edited Loading

codecov bot commented Sep 22, 2021 • edited Loading

Codecov Report

mongoose-im commented Sep 22, 2021 • edited Loading

mongoose-im commented Sep 22, 2021 • edited Loading

mongoose-im commented Sep 22, 2021 • edited Loading

chrzaszcz left a comment

Choose a reason for hiding this comment

mongoose-im commented Sep 23, 2021 • edited Loading

vkatsuba Sep 23, 2021

Choose a reason for hiding this comment

vkatsuba left a comment

Choose a reason for hiding this comment

Premwoik commented Sep 22, 2021 •

edited

Loading

codecov bot commented Sep 22, 2021 •

edited

Loading

mongoose-im commented Sep 22, 2021 •

edited

Loading

mongoose-im commented Sep 22, 2021 •

edited

Loading

mongoose-im commented Sep 22, 2021 •

edited

Loading

mongoose-im commented Sep 23, 2021 •

edited

Loading